Make PR merge options more intuitive #16582
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Reword options making clear whether the PRed branch is rebased or not, and which type of commit will be created if any.
zeripath
changed the title
zeripath
approved these changes
Jul 30, 2021
GiteaBot
added
the
lgtm/need 1
|
Not sure why the build fails. I ran it fine locally, plus the patch does not actually change any code, only locale strings. |
|
IMHO current is better, and it is consistent with git defaults. |
lafriks
approved these changes
Aug 2, 2021
GiteaBot
added
lgtm/done
Codecov Report
@@ Coverage Diff @@
## main #16582 +/- ##
==========================================
- Coverage 45.37% 45.35% -0.02%
==========================================
Files 750 750
Lines 85098 85098
==========================================
- Hits 38611 38599 -12
- Misses 40243 40254 +11
- Partials 6244 6245 +1
Continue to review full report at Codecov.
|
|
make lgtm work |
AbdulrhmnGhanem
pushed a commit
to kitspace/gitea
that referenced
this pull request
Aug 10, 2021
Reword options making clear whether the PRed branch is rebased or not, and which type of commit will be created if any.
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Reword options making clear whether the PRed branch is rebased or not, and which type of commit will be created if any.
Fix #5863